From 982acec366f1245e9eda97572a3d725d619b82b1 Mon Sep 17 00:00:00 2001 From: Chao Gao Date: Thu, 31 Aug 2017 01:01:49 -0400 Subject: [PATCH] xl/libacpi: extend lapic_id() to uint32_t This patch is to extend lapic_id() to support more vcpus. Signed-off-by: Chao Gao Signed-off-by: Lan Tianyu Acked-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/firmware/hvmloader/util.c | 2 +- tools/libacpi/libacpi.h | 2 +- tools/libxl/libxl_x86_acpi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index ab5448bbf6..0c3f2d24cd 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -883,7 +883,7 @@ static void acpi_mem_free(struct acpi_ctxt *ctxt, /* ACPI builder currently doesn't free memory so this is just a stub */ } -static uint8_t acpi_lapic_id(unsigned cpu) +static uint32_t acpi_lapic_id(unsigned cpu) { return LAPIC_ID(cpu); } diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h index 2ed1ecfc8e..a2efd23b0b 100644 --- a/tools/libacpi/libacpi.h +++ b/tools/libacpi/libacpi.h @@ -91,7 +91,7 @@ struct acpi_config { unsigned long rsdp; /* x86-specific parameters */ - uint8_t (*lapic_id)(unsigned cpu); + uint32_t (*lapic_id)(unsigned cpu); uint32_t lapic_base_address; uint32_t ioapic_base_address; uint16_t pci_isa_irq_mask; diff --git a/tools/libxl/libxl_x86_acpi.c b/tools/libxl/libxl_x86_acpi.c index c0a6e321ec..176175676f 100644 --- a/tools/libxl/libxl_x86_acpi.c +++ b/tools/libxl/libxl_x86_acpi.c @@ -84,7 +84,7 @@ static void acpi_mem_free(struct acpi_ctxt *ctxt, { } -static uint8_t acpi_lapic_id(unsigned cpu) +static uint32_t acpi_lapic_id(unsigned cpu) { return cpu * 2; } -- 2.30.2